cssstylefuncs: Rename functions

This is in preaparation for the big GtkCssComputedValues => GtkCssStyle
rename

diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c
index 31cfefd0f7c09e912eb6f96feb863f2a05e01ad8..d401759a61ab3f9430d644c10708cc7083c1e970 100644 (file)
--- a/gtk/gtkcsscustomproperty.c
+++ b/gtk/gtkcsscustomproperty.c
@@ -75,7 +75,7 @@ gtk_css_custom_property_parse_value (GtkStyleProperty *property,
     {
       g_value_init (&value, gtk_css_custom_property_get_specified_type (custom->pspec));
 
-      success = _gtk_css_style_parse_value (&value, parser);
+      success = _gtk_css_style_funcs_parse_value (&value, parser);
     }
 
   if (!success)

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 0ebe32b4e88fe5a8970e3e641341fec880419720..aa61771d36ec030415f108106e56dd171d1dff26 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1727,8 +1727,8 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
                                             val->section != NULL ? gtk_css_section_get_file (val->section) : NULL,
                                             val->value);
 
-             found = _gtk_css_style_parse_value (value,
-                                                 scanner->parser);
+             found = _gtk_css_style_funcs_parse_value (value,
+                                                       scanner->parser);
 
              gtk_css_scanner_destroy (scanner);
 

diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c
index d196550c5800864d6b2e6bc06cf9a988a6bc5fb3..56f5cdf0d6059a1bcdd934f0a7f423fdfd6173a0 100644 (file)
--- a/gtk/gtkcssstylefuncs.c
+++ b/gtk/gtkcssstylefuncs.c
@@ -1075,8 +1075,8 @@ gtk_css_style_funcs_init (void)
  * Returns: %TRUE if parsing succeeded.
  **/
 gboolean
-_gtk_css_style_parse_value (GValue       *value,
-                            GtkCssParser *parser)
+_gtk_css_style_funcs_parse_value (GValue       *value,
+                                  GtkCssParser *parser)
 {
   GtkStyleParseFunc func;
 
@@ -1111,8 +1111,8 @@ _gtk_css_style_parse_value (GValue       *value,
  * valid value, a random string will be printed instead.
  **/
 void
-_gtk_css_style_print_value (const GValue *value,
-                            GString      *string)
+_gtk_css_style_funcs_print_value (const GValue *value,
+                                  GString      *string)
 {
   GtkStylePrintFunc func;
 
@@ -1153,12 +1153,12 @@ _gtk_css_style_print_value (const GValue *value,
  * Returns: the resulting value
  **/
 GtkCssValue *
-_gtk_css_style_compute_value (GtkStyleProviderPrivate *provider,
-                              GtkCssComputedValues    *values,
-                              GtkCssComputedValues    *parent_values,
-                             GType                    target_type,
-                              GtkCssValue             *specified,
-                              GtkCssDependencies      *dependencies)
+_gtk_css_style_funcs_compute_value (GtkStyleProviderPrivate *provider,
+                                    GtkCssComputedValues    *values,
+                                    GtkCssComputedValues    *parent_values,
+                                    GType                    target_type,
+                                    GtkCssValue             *specified,
+                                    GtkCssDependencies      *dependencies)
 {
   GtkStyleComputeFunc func;
 

diff --git a/gtk/gtkcssstylefuncsprivate.h b/gtk/gtkcssstylefuncsprivate.h
index df13b809490bf6c90228df51fd8f54989d665a88..47c52a5c6985b53b7dbab09c23f13a6e0bf75747 100644 (file)
--- a/gtk/gtkcssstylefuncsprivate.h
+++ b/gtk/gtkcssstylefuncsprivate.h
@@ -24,11 +24,11 @@
 
 G_BEGIN_DECLS
 
-gboolean            _gtk_css_style_parse_value             (GValue                  *value,
+gboolean            _gtk_css_style_funcs_parse_value       (GValue                  *value,
                                                             GtkCssParser            *parser);
-void                _gtk_css_style_print_value             (const GValue            *value,
+void                _gtk_css_style_funcs_print_value       (const GValue            *value,
                                                             GString                 *string);
-GtkCssValue *       _gtk_css_style_compute_value           (GtkStyleProviderPrivate *provider,
+GtkCssValue *       _gtk_css_style_funcs_compute_value     (GtkStyleProviderPrivate *provider,
                                                             GtkCssComputedValues    *values,
                                                             GtkCssComputedValues    *parent_values,
                                                            GType                    target_type,

diff --git a/gtk/gtkcsstypedvalue.c b/gtk/gtkcsstypedvalue.c
index 54716182a6aa06e206a1718f2d117c86c57f0023..be2458469a4fdd9247cd64e923abdb7cac50c9b6 100644 (file)
--- a/gtk/gtkcsstypedvalue.c
+++ b/gtk/gtkcsstypedvalue.c
@@ -45,7 +45,7 @@ gtk_css_value_typed_compute (GtkCssValue             *value,
 {
   GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (_gtk_css_style_property_lookup_by_id (property_id));
 
-  return _gtk_css_style_compute_value (provider, values, parent_values, custom->pspec->value_type, value, dependencies);
+  return _gtk_css_style_funcs_compute_value (provider, values, parent_values, custom->pspec->value_type, value, dependencies);
 }
 
 static gboolean
@@ -68,7 +68,7 @@ static void
 gtk_css_value_typed_print (const GtkCssValue *value,
                            GString           *string)
 {
-  _gtk_css_style_print_value (&value->value, string);
+  _gtk_css_style_funcs_print_value (&value->value, string);
 }
 
 static const GtkCssValueClass GTK_CSS_VALUE_TYPED = {